Thank you to anyone who has already donated - your generous donations helped make three months of treatment possible.
My brother Nate continues to fight stage IV Hodgkin's lymphoma. He's just 31, with a wife and baby girl. They have no active income (since he's been unable to return to work), no insurance, and cannot afford the treatment he needs. Nate and his family need your help. Please consider a donation, every dollar helps. Thanks.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 |
diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c index 433606f..d034666 100644 static int __out_ep_list_ep0[NUM_OUT_EP + 1] = {0, OUT_EP_LIST}; for(counter = 0, ep = (list)[0]; \ counter < (size); \ counter++, ep = (list)[counter]) - + #define FOR_EACH_IN_EP_EX(include_ep0, counter, ep) \ FOR_EACH_EP(include_ep0 ? __in_ep_list_ep0 : __in_ep_list, \ include_ep0 ? NUM_IN_EP + 1: NUM_IN_EP, counter, ep) static int __out_ep_list_ep0[NUM_OUT_EP + 1] = {0, OUT_EP_LIST}; #define FOR_EACH_OUT_EP_EX(include_ep0, counter, ep) \ FOR_EACH_EP(include_ep0 ? __out_ep_list_ep0 : __out_ep_list, \ include_ep0 ? NUM_OUT_EP + 1: NUM_OUT_EP, counter, ep) - + #define FOR_EACH_IN_EP(counter, ep) \ FOR_EACH_IN_EP_EX(false, counter, ep) enum ep0state /* endpoints[ep_num][DIR_IN/DIR_OUT] */ static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS][2]; /* setup packet for EP0 */ -static struct usb_ctrlrequest ep0_setup_pkt __attribute__((aligned(32))); +static struct usb_ctrlrequest _ep0_setup_pkt __attribute__((aligned(32))); +static struct usb_ctrlrequest *ep0_setup_pkt = AS3525_UNCACHED_ADDR(&_ep0_setup_pkt); /* state of EP0 */ static enum ep0state ep0_state; static void as3525v2_connect(void) bitset32(&CGU_PERI, CGU_USB_CLOCK_ENABLE); usb_delay(); /* 2) enable usb phy clock */ + CCU_USB = (CCU_USB & ~(3<<24)) | (1 << 24); /* ?? */ /* PHY clock */ CGU_USB = 1<<5 /* enable */ - | (CLK_DIV(AS3525_PLLA_FREQ, 60000000)) << 2 - | 1; /* source = PLLA */ + | 0 << 2 /* no divider */ + | 0; /* source = ?? */ usb_delay(); /* 3) clear "stop pclk" */ PCGCCTL &= ~0x1; static void as3525v2_connect(void) GUSBCFG |= GUSBCFG_force_device_mode; usb_delay(); /* 11) Do something that is probably CCU related but undocumented*/ - CCU_USB &= ~0x1000; - usb_delay(); - CCU_USB &= ~0x300000; + CCU_USB &= ~(1<<12); + nop;nop;nop;nop;nop; + nop;nop;nop;nop;nop; + CCU_USB &= ~(3<<20); usb_delay(); /* 12) reset usb core parameters (dev addr, speed, ...) */ DCFG = 0; static void enable_device_interrupts(void) static void flush_tx_fifos(int nums) { unsigned int i = 0; - + GRSTCTL = (nums << GRSTCTL_txfnum_bitp) | GRSTCTL_txfflsh_flush; while(GRSTCTL & GRSTCTL_txfflsh_flush && i < 0x300) static void flush_tx_fifos(int nums) static void flush_rx_fifo(void) { unsigned int i = 0; - + GRSTCTL = GRSTCTL_rxfflsh_flush; while(GRSTCTL & GRSTCTL_rxfflsh_flush && i < 0x300) i++; static void flush_rx_fifo(void) static void prepare_setup_ep0(void) { logf("usb-drv: prepare EP0"); - /* setup DMA */ - //memset(&ep0_setup_pkt, 0, sizeof ep0_setup_pkt); - //clean_dcache_range((void*)&ep0_setup_pkt, sizeof ep0_setup_pkt); /* force write back */ - clean_dcache(); - DOEPDMA(0) = (unsigned long)AS3525_PHYSICAL_ADDR(&ep0_setup_pkt); /* virtual address=physical address */ + //memset(ep0_setup_pkt, 0, sizeof *ep0_setup_pkt); /* Setup EP0 OUT with the following parameters: * packet count = 1 static void prepare_setup_ep0(void) */ DOEPTSIZ(0) = (1 << DEPTSIZ0_supcnt_bitp) | (1 << DEPTSIZ0_pkcnt_bitp) - | 8; + | (8 << DEPTSIZ0_xfersize_bitp); + + /* setup DMA */ + DOEPDMA(0) = (unsigned long)AS3525_PHYSICAL_ADDR(&_ep0_setup_pkt); /* Enable endpoint, clear nak */ ep0_state = EP0_WAIT_SETUP; - DOEPCTL(0) |= DEPCTL_epena | DEPCTL_cnak; + DOEPCTL(0) |= DEPCTL_epena | DEPCTL_usbactep | DEPCTL_cnak; } static void handle_ep0_complete(bool is_ack) static void handle_ep0_setup(void) return; } /* determine is there is a data phase */ - if(ep0_setup_pkt.wLength == 0) + if(ep0_setup_pkt->wLength == 0) /* no: wait for ack */ ep0_state = EP0_WAIT_ACK; else static void reset_endpoints(void) else DIEPCTL(ep) = 0; } - + FOR_EACH_OUT_EP_AND_EP0(i, ep) { endpoints[ep][DIR_OUT].active = false; static void reset_endpoints(void) /* 64 bytes packet size, active endpoint */ DOEPCTL(0) = (DEPCTL_MPS_64 << DEPCTL_mps_bitp) | DEPCTL_usbactep | DEPCTL_snak; DIEPCTL(0) = (DEPCTL_MPS_64 << DEPCTL_mps_bitp) | DEPCTL_usbactep | DEPCTL_snak; - + prepare_setup_ep0(); } static void cancel_all_transfers(bool cancel_ep0) wakeup_signal(&endpoints[ep][DIR_OUT].complete); DOEPCTL(ep) = (DOEPCTL(ep) & ~DEPCTL_usbactep) | DEPCTL_epdis | DEPCTL_snak; } - + restore_irq(flags); } static void core_dev_init(void) /* Restart the phy clock */ PCGCCTL = 0; /* Set phy speed : high speed */ - DCFG = (DCFG & ~bitm(DCFG, devspd)) | DCFG_devspd_hs_phy_fs; - + DCFG = (DCFG & ~bitm(DCFG, devspd)) | DCFG_devspd_hs_phy_hs; + /* Check hardware capabilities */ if(extract(GHWCFG2, arch) != GHWCFG2_ARCH_INTERNAL_DMA) panicf("usb-drv: wrong architecture (%ld)", extract(GHWCFG2, arch)); static void core_init(void) /* Select UTMI+ 16 */ GUSBCFG |= GUSBCFG_phy_if; GUSBCFG = (GUSBCFG & ~bitm(GUSBCFG, toutcal)) | 7 << GUSBCFG_toutcal_bitp; - + /* fixme: the current code is for internal DMA only, the clip+ architecture * define the internal DMA model */ /* Set burstlen and enable DMA*/ static void core_init(void) /* perform device model specific init */ core_dev_init(); - + /* Reconnect */ DCTL &= ~DCTL_sftdiscon; } void usb_drv_exit(void) static void handle_ep_int(int ep, bool dir_in) { + if (ep) + panicf("EP %d %s", ep, dir_in ? "in" : "out"); + struct usb_endpoint *endpoint = &endpoints[ep][dir_in]; if(dir_in) { static void handle_ep_int(int ep, bool dir_in) endpoint->status = 0; /* works even for EP0 */ int transfered = endpoint->len - (DIEPTSIZ(ep) & DEPTSIZ_xfersize_bits); - logf("len=%d reg=%ld xfer=%d", endpoint->len, + panicf("len=%d reg=%ld xfer=%d", endpoint->len, (DIEPTSIZ(ep) & DEPTSIZ_xfersize_bits), transfered); - //invalidate_dcache_range(endpoint->buffer, transfered); - invalidate_dcache(); + invalidate_dcache_range(endpoint->buffer, transfered); //DIEPCTL(ep) |= DEPCTL_snak; /* handle EP0 state if necessary, * this is a ack if length is 0 */ static void handle_ep_int(int ep, bool dir_in) endpoint->status = 0; /* works even for EP0 */ int transfered = endpoint->len - (DOEPTSIZ(ep) & DEPTSIZ_xfersize_bits); - logf("len=%d reg=%ld xfer=%d", endpoint->len, + panicf("len=%d reg=%ld xfer=%d", endpoint->len, (DOEPTSIZ(ep) & DEPTSIZ_xfersize_bits), transfered); - //invalidate_dcache_range(endpoint->buffer, transfered); - invalidate_dcache(); + invalidate_dcache_range(endpoint->buffer, transfered); /* handle EP0 state if necessary, * this is a ack if length is 0 */ if(ep == 0) static void handle_ep_int(int ep, bool dir_in) logf("usb-drv: setup on EP%d OUT", ep); if(ep != 0) panicf("usb-drv: setup not on EP0, this is impossible"); + + if((DOEPTSIZ(ep) >> DEPTSIZ0_supcnt_bitp & DEPTSIZ0_supcnt_bits) < 2) + panicf("CANNOT handle > 1 setup packet in DMA mode"); + + if((DOEPTSIZ(ep) & DEPTSIZ_xfersize_bits) != 0) { logf("usb-drv: ignore spurious setup (xfersize=%ld)", DOEPTSIZ(ep) & DEPTSIZ_xfersize_bits); static void handle_ep_int(int ep, bool dir_in) else { //DOEPCTL(ep) |= DEPCTL_snak; - /* handle the set address here because of a bug in the usb core */ - //invalidate_dcache_range((void*)&ep0_setup_pkt, sizeof ep0_setup_pkt); - invalidate_dcache(); /* handle EP0 state */ handle_ep0_setup(); - logf(" rt=%x r=%x", ep0_setup_pkt.bRequestType, ep0_setup_pkt.bRequest); - if(ep0_setup_pkt.bRequestType == USB_TYPE_STANDARD && - ep0_setup_pkt.bRequest == USB_REQ_SET_ADDRESS) - usb_drv_set_address(ep0_setup_pkt.wValue); - usb_core_control_request(&ep0_setup_pkt); + logf(" rt=%x r=%x", ep0_setup_pkt->bRequestType, ep0_setup_pkt->bRequest); + + /* handle the set address here because of a bug in the usb core */ + if(ep0_setup_pkt->bRequestType == USB_TYPE_STANDARD && + ep0_setup_pkt->bRequest == USB_REQ_SET_ADDRESS) + usb_drv_set_address(ep0_setup_pkt->wValue); + + usb_core_control_request(ep0_setup_pkt); } } /* clear interrupts */ void INT_USB(void) { logf("usb-drv: wake up"); } - + if(sts & GINTMSK_otgintr) { logf("usb-drv: otg int"); void INT_USB(void) { panicf("usb-drv: disconnect"); cancel_all_transfers(true); - usb_enable(false); + usb_enable(false); } + sts &= ~(GINTMSK_usbreset | GINTMSK_enumdone | GINTMSK_outepintr | GINTMSK_inepintr); + sts &= ~(GINTMSK_otgintr|GINTMSK_usbsuspend|GINTMSK_wkupintr); + if(sts) + panicf("unhdld 0x%lx", sts); GINTSTS = sts; } int usb_drv_request_endpoint(int type, int dir) { (void) type; (void) dir; + panicf("%s(%d, %d)", __func__, type, dir); logf("usb-drv: request endpoint (type=%d,dir=%s)", type, dir == USB_DIR_IN ? "IN" : "OUT"); return -1; } static int usb_drv_transfer(int ep, void *ptr, int len, bool dir_in, bool blocki ep = EP_NUM(ep); logf("usb-drv: xfer EP%d, len=%d, dir_in=%d, blocking=%d", ep, len, dir_in, blocking); - + volatile unsigned long *epctl = dir_in ? &DIEPCTL(ep) : &DOEPCTL(ep); volatile unsigned long *eptsiz = dir_in ? &DIEPTSIZ(ep) : &DOEPTSIZ(ep); volatile unsigned long *epdma = dir_in ? &DIEPDMA(ep) : &DOEPDMA(ep); static int usb_drv_transfer(int ep, void *ptr, int len, bool dir_in, bool blocki if(dir_in) logf("GNPTXSTS=%lx", GNPTXSTS); - + endpoint->busy = true; endpoint->len = len; endpoint->wait = blocking; static int usb_drv_transfer(int ep, void *ptr, int len, bool dir_in, bool blocki DEPTSIZ = 1 << DEPTSIZ_pkcnt_bitp; else DEPTSIZ = (nb_packets << DEPTSIZ_pkcnt_bitp) | len; - //clean_dcache_range(ptr, len); - clean_dcache(); + clean_dcache_range(ptr, len); DEPDMA = (unsigned long)AS3525_PHYSICAL_ADDR(ptr); logf("pkt=%d dma=%lx", nb_packets, DEPDMA); - + DEPCTL |= DEPCTL_epena | DEPCTL_cnak | DEPCTL_usbactep; if(blocking) void usb_drv_set_address(int address) void usb_drv_stall(int ep, bool stall, bool in) { - (void) ep; - (void) stall; - (void) in; - logf("usb-drv: %sstall EP%d %s", stall ? "" : "un", ep, in ? "IN" : "OUT"); + if (stall) { + if (in) + DIEPCTL(ep) |= DEPCTL_stall; + else + DOEPCTL(ep) |= DEPCTL_stall; + } else { + if (in) + DIEPCTL(ep) &= ~DEPCTL_stall; + else + DOEPCTL(ep) &= ~DEPCTL_stall; + } } bool usb_drv_stalled(int ep, bool in) { - (void) ep; - (void) in; - return true; + return (in ? DIEPCTL(ep) : DOEPCTL(ep)) & DEPCTL_stall; } |
